ci: Rebase extension-ci image to F32

... and base our 'js' test on the js engine we are actually using.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1177

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e25e96f101d655944e5f59d1f6915c2a8ad8efc..0a158117b3bf1438514be792363af1d6bd29c326 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,10 +28,10 @@ check_commit_log:
         - merge_requests
 
 js_check:
-    image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
+    image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v2
     stage: review
     script:
-        - find js -name '*.js' -exec js60 -c -s '{}' ';' 2>&1 | tee $JS_LOG
+        - find js -name '*.js' -exec js68 -c -s '{}' ';' 2>&1 | tee $JS_LOG
         - (! grep -q . $JS_LOG)
     <<: *only_default
     artifacts:
@@ -40,7 +40,7 @@ js_check:
         when: on_failure
 
 eslint:
-    image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
+    image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v2
     stage: review
     script:
         - ./.gitlab-ci/run-eslint.sh
@@ -51,14 +51,14 @@ eslint:
         when: always
 
 potfile_check:
-    image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
+    image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v2
     stage: review
     script:
         - ./.gitlab-ci/check-potfiles.sh
     <<: *only_default
 
 no_template_check:
-    image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
+    image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v2
     stage: review
     script:
         - ./.gitlab-ci/check-template-strings.sh

diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 4c7f1097d2f9078142a52e3dfe6e21c74df11bbb..fd0eb2a935dbb0f0dbf0f3652d5ffc99d504c0d5 100644 (file)
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,17 +1,17 @@
 # Rebuild and push with
 #
 #     cd .gitlab-ci/
-#     podman build --format docker --no-cache -t registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1 .
-#     podman push registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
+#     podman build --format docker --no-cache -t registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v2 .
+#     podman push registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v2
 #
 
-FROM registry.fedoraproject.org/fedora:latest
+FROM registry.fedoraproject.org/fedora:32
 
 RUN dnf -y update && dnf -y upgrade && \
     dnf install -y 'dnf-command(copr)' git && \
 
-    # For syntax checks with `find . -name '*.js' -exec js60 -c -s '{}' ';'`
-    dnf install -y findutils mozjs60-devel && \
+    # For syntax checks with `find . -name '*.js' -exec js68 -c -s '{}' ';'`
+    dnf install -y findutils mozjs68-devel && \
 
     # For static analysis with eslint
     dnf install -y nodejs && \
@@ -21,5 +21,4 @@ RUN dnf -y update && dnf -y upgrade && \
     dnf copr enable -y fmuellner/gnome-shell-ci && \
     dnf install -y gnome-extensions-tool meson && \
 
-    dnf clean all && \
-    rm -rf /var/cache/dnf
+    dnf clean all